# Conflicts:
#	core/conf/vars.go
#	wasmsdk/proxy.go
#	zboxcore/blockchain/entity.go
#	zboxcore/client/entity.go
#	zboxcore/sdk/allocation_file_test.go
#	zboxcore/sdk/blockdownloadworker.go
#	zboxcore/sdk/chunked_upload.go
#	zboxcore/sdk/downloadworker.go
#	zboxcore/sdk/rollback.go
#	zboxcore/sdk/sdk.go
#	zboxcore/zboxutil/http.go
#	zcncore/networkworker.go
#	zcncore/networkworker_mobile.go
#	zcncore/transaction.go
#	zcncore/transaction_base.go
#	zcncore/wallet_base.go

* add storage version for allocation

* add commit for v2

* add delete change

* add delete dir and get refs

* fix process change for delete dir

* fix delete dir

* add timming log

* fix setting root

* send ref path request to all

* add merge logs

* fix collapse for short node

* check refs in delete

* add changesv2

* add eg for signature

* set limit to 4

* remove group

* fix path

* remove hash signature map

* remove sign timing

* check timestamp

* add check for lwm

* implement rename move and copy for v2

* add repair for v2

* check for cancel

* fix copy and move

* fix no changes in connection

* fix repair

* fix eof check

* fix repair eof

* set path hash

* fix update key

* add prev weight

* add debug log for commit size

* fix update key weight

* fix alloc root

* fix chain hash

* add fix for verifying trie root

* fix delete directory

* fix mask pos

* fix create existing dir

* fix new dir consensus

* take base as dest name

* Added storageVersion

* fix ut

* fix lint

* fix list and stats ut

* fix wasm error

* use v2 as default

* fetch alloc version from sharders

* fix lint

* fix merge

* Update blobber settings DelegateWallet

* Fix

* Fix

---------

Co-authored-by: hitenjain14 <[email protected]>
Co-authored-by: Yury <[email protected]>
Co-authored-by: Hitenjain14 <[email protected]>

…boxcore

# Conflicts:
#	core/version/version.go
#	go.mod
#	go.sum
#	zboxcore/blockchain/entity.go
#	zboxcore/sdk/blobber_operations_mobile.go
#	zboxcore/sdk/chunked_upload_form_builder.go
#	zboxcore/sdk/commitworker.go
#	zboxcore/sdk/filerefsworker.go

Optimise/get and send

…refactor-zboxcore

# Conflicts:
#	zboxcore/sdk/allocation.go
#	zboxcore/sdk/chunked_upload_blobber.go
#	zboxcore/sdk/commitworker.go
#	zboxcore/sdk/filerefsworker.go

This reverts commit 6fec102, reversing
changes made to bceb3f9.

…mise/send-and-get

Feature/multi wallet

Optimise send and get to miners and sharders